Move `arm_common.c` out of aarch64 folder
authorSoby Mathew <[email protected]>
Thu, 7 Jul 2016 07:45:56 +0000 (08:45 +0100)
committerSoby Mathew <[email protected]>
Tue, 19 Jul 2016 09:19:08 +0000 (10:19 +0100)
This patch moves the `arm_common.c` file from `plat/arm/common/aarch64/`
to the parent directory since the functions implemented in the file are
not AArch64 specific. The platform makefiles are also modified for this
change.

Change-Id: I776d2e4958f59041476cf2f53a9adb5b2d304ee0

plat/arm/common/aarch64/arm_common.c [deleted file]
plat/arm/common/arm_common.c [new file with mode: 0644]
plat/arm/common/arm_common.mk
plat/xilinx/zynqmp/platform.mk

diff --git a/plat/arm/common/aarch64/arm_common.c b/plat/arm/common/aarch64/arm_common.c
deleted file mode 100644 (file)
index 33d2b06..0000000
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * Neither the name of ARM nor the names of its contributors may be used
- * to endorse or promote products derived from this software without specific
- * prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-#include <arch.h>
-#include <arch_helpers.h>
-#include <assert.h>
-#include <debug.h>
-#include <mmio.h>
-#include <plat_arm.h>
-#include <platform_def.h>
-#include <xlat_tables.h>
-
-extern const mmap_region_t plat_arm_mmap[];
-
-/* Weak definitions may be overridden in specific ARM standard platform */
-#pragma weak plat_get_ns_image_entrypoint
-#pragma weak plat_arm_get_mmap
-
-/* Conditionally provide a weak definition of plat_get_syscnt_freq2 to avoid
- * conflicts with the definition in plat/common. */
-#if ERROR_DEPRECATED
-#pragma weak plat_get_syscnt_freq2
-#else
-#pragma weak plat_get_syscnt_freq
-#endif
-
-/*
- * Set up the page tables for the generic and platform-specific memory regions.
- * The extents of the generic memory regions are specified by the function
- * arguments and consist of:
- * - Trusted SRAM seen by the BL image;
- * - Code section;
- * - Read-only data section;
- * - Coherent memory region, if applicable.
- */
-void arm_setup_page_tables(uintptr_t total_base,
-                          size_t total_size,
-                          uintptr_t code_start,
-                          uintptr_t code_limit,
-                          uintptr_t rodata_start,
-                          uintptr_t rodata_limit
-#if USE_COHERENT_MEM
-                          ,
-                          uintptr_t coh_start,
-                          uintptr_t coh_limit
-#endif
-                          )
-{
-       /*
-        * Map the Trusted SRAM with appropriate memory attributes.
-        * Subsequent mappings will adjust the attributes for specific regions.
-        */
-       VERBOSE("Trusted SRAM seen by this BL image: %p - %p\n",
-               (void *) total_base, (void *) (total_base + total_size));
-       mmap_add_region(total_base, total_base,
-                       total_size,
-                       MT_MEMORY | MT_RW | MT_SECURE);
-
-       /* Re-map the code section */
-       VERBOSE("Code region: %p - %p\n",
-               (void *) code_start, (void *) code_limit);
-       mmap_add_region(code_start, code_start,
-                       code_limit - code_start,
-                       MT_CODE | MT_SECURE);
-
-       /* Re-map the read-only data section */
-       VERBOSE("Read-only data region: %p - %p\n",
-               (void *) rodata_start, (void *) rodata_limit);
-       mmap_add_region(rodata_start, rodata_start,
-                       rodata_limit - rodata_start,
-                       MT_RO_DATA | MT_SECURE);
-
-#if USE_COHERENT_MEM
-       /* Re-map the coherent memory region */
-       VERBOSE("Coherent region: %p - %p\n",
-               (void *) coh_start, (void *) coh_limit);
-       mmap_add_region(coh_start, coh_start,
-                       coh_limit - coh_start,
-                       MT_DEVICE | MT_RW | MT_SECURE);
-#endif
-
-       /* Now (re-)map the platform-specific memory regions */
-       mmap_add(plat_arm_get_mmap());
-
-       /* Create the page tables to reflect the above mappings */
-       init_xlat_tables();
-}
-
-uintptr_t plat_get_ns_image_entrypoint(void)
-{
-       return PLAT_ARM_NS_IMAGE_OFFSET;
-}
-
-/*******************************************************************************
- * Gets SPSR for BL32 entry
- ******************************************************************************/
-uint32_t arm_get_spsr_for_bl32_entry(void)
-{
-       /*
-        * The Secure Payload Dispatcher service is responsible for
-        * setting the SPSR prior to entry into the BL32 image.
-        */
-       return 0;
-}
-
-/*******************************************************************************
- * Gets SPSR for BL33 entry
- ******************************************************************************/
-uint32_t arm_get_spsr_for_bl33_entry(void)
-{
-       unsigned long el_status;
-       unsigned int mode;
-       uint32_t spsr;
-
-       /* Figure out what mode we enter the non-secure world in */
-       el_status = read_id_aa64pfr0_el1() >> ID_AA64PFR0_EL2_SHIFT;
-       el_status &= ID_AA64PFR0_ELX_MASK;
-
-       mode = (el_status) ? MODE_EL2 : MODE_EL1;
-
-       /*
-        * TODO: Consider the possibility of specifying the SPSR in
-        * the FIP ToC and allowing the platform to have a say as
-        * well.
-        */
-       spsr = SPSR_64(mode, MODE_SP_ELX, DISABLE_ALL_EXCEPTIONS);
-       return spsr;
-}
-
-/*******************************************************************************
- * Configures access to the system counter timer module.
- ******************************************************************************/
-#ifdef ARM_SYS_TIMCTL_BASE
-void arm_configure_sys_timer(void)
-{
-       unsigned int reg_val;
-
-#if ARM_CONFIG_CNTACR
-       reg_val = (1 << CNTACR_RPCT_SHIFT) | (1 << CNTACR_RVCT_SHIFT);
-       reg_val |= (1 << CNTACR_RFRQ_SHIFT) | (1 << CNTACR_RVOFF_SHIFT);
-       reg_val |= (1 << CNTACR_RWVT_SHIFT) | (1 << CNTACR_RWPT_SHIFT);
-       mmio_write_32(ARM_SYS_TIMCTL_BASE + CNTACR_BASE(PLAT_ARM_NSTIMER_FRAME_ID), reg_val);
-#endif /* ARM_CONFIG_CNTACR */
-
-       reg_val = (1 << CNTNSAR_NS_SHIFT(PLAT_ARM_NSTIMER_FRAME_ID));
-       mmio_write_32(ARM_SYS_TIMCTL_BASE + CNTNSAR, reg_val);
-}
-#endif /* ARM_SYS_TIMCTL_BASE */
-
-/*******************************************************************************
- * Returns ARM platform specific memory map regions.
- ******************************************************************************/
-const mmap_region_t *plat_arm_get_mmap(void)
-{
-       return plat_arm_mmap;
-}
-
-#ifdef ARM_SYS_CNTCTL_BASE
-
-#if ERROR_DEPRECATED
-unsigned int plat_get_syscnt_freq2(void)
-{
-       unsigned int counter_base_frequency;
-#else
-unsigned long long plat_get_syscnt_freq(void)
-{
-       unsigned long long counter_base_frequency;
-#endif /* ERROR_DEPRECATED */
-
-       /* Read the frequency from Frequency modes table */
-       counter_base_frequency = mmio_read_32(ARM_SYS_CNTCTL_BASE + CNTFID_OFF);
-
-       /* The first entry of the frequency modes table must not be 0 */
-       if (counter_base_frequency == 0)
-               panic();
-
-       return counter_base_frequency;
-}
-
-#endif /* ARM_SYS_CNTCTL_BASE */
diff --git a/plat/arm/common/arm_common.c b/plat/arm/common/arm_common.c
new file mode 100644 (file)
index 0000000..33d2b06
--- /dev/null
@@ -0,0 +1,206 @@
+/*
+ * Copyright (c) 2015-2016, ARM Limited and Contributors. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of ARM nor the names of its contributors may be used
+ * to endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <arch.h>
+#include <arch_helpers.h>
+#include <assert.h>
+#include <debug.h>
+#include <mmio.h>
+#include <plat_arm.h>
+#include <platform_def.h>
+#include <xlat_tables.h>
+
+extern const mmap_region_t plat_arm_mmap[];
+
+/* Weak definitions may be overridden in specific ARM standard platform */
+#pragma weak plat_get_ns_image_entrypoint
+#pragma weak plat_arm_get_mmap
+
+/* Conditionally provide a weak definition of plat_get_syscnt_freq2 to avoid
+ * conflicts with the definition in plat/common. */
+#if ERROR_DEPRECATED
+#pragma weak plat_get_syscnt_freq2
+#else
+#pragma weak plat_get_syscnt_freq
+#endif
+
+/*
+ * Set up the page tables for the generic and platform-specific memory regions.
+ * The extents of the generic memory regions are specified by the function
+ * arguments and consist of:
+ * - Trusted SRAM seen by the BL image;
+ * - Code section;
+ * - Read-only data section;
+ * - Coherent memory region, if applicable.
+ */
+void arm_setup_page_tables(uintptr_t total_base,
+                          size_t total_size,
+                          uintptr_t code_start,
+                          uintptr_t code_limit,
+                          uintptr_t rodata_start,
+                          uintptr_t rodata_limit
+#if USE_COHERENT_MEM
+                          ,
+                          uintptr_t coh_start,
+                          uintptr_t coh_limit
+#endif
+                          )
+{
+       /*
+        * Map the Trusted SRAM with appropriate memory attributes.
+        * Subsequent mappings will adjust the attributes for specific regions.
+        */
+       VERBOSE("Trusted SRAM seen by this BL image: %p - %p\n",
+               (void *) total_base, (void *) (total_base + total_size));
+       mmap_add_region(total_base, total_base,
+                       total_size,
+                       MT_MEMORY | MT_RW | MT_SECURE);
+
+       /* Re-map the code section */
+       VERBOSE("Code region: %p - %p\n",
+               (void *) code_start, (void *) code_limit);
+       mmap_add_region(code_start, code_start,
+                       code_limit - code_start,
+                       MT_CODE | MT_SECURE);
+
+       /* Re-map the read-only data section */
+       VERBOSE("Read-only data region: %p - %p\n",
+               (void *) rodata_start, (void *) rodata_limit);
+       mmap_add_region(rodata_start, rodata_start,
+                       rodata_limit - rodata_start,
+                       MT_RO_DATA | MT_SECURE);
+
+#if USE_COHERENT_MEM
+       /* Re-map the coherent memory region */
+       VERBOSE("Coherent region: %p - %p\n",
+               (void *) coh_start, (void *) coh_limit);
+       mmap_add_region(coh_start, coh_start,
+                       coh_limit - coh_start,
+                       MT_DEVICE | MT_RW | MT_SECURE);
+#endif
+
+       /* Now (re-)map the platform-specific memory regions */
+       mmap_add(plat_arm_get_mmap());
+
+       /* Create the page tables to reflect the above mappings */
+       init_xlat_tables();
+}
+
+uintptr_t plat_get_ns_image_entrypoint(void)
+{
+       return PLAT_ARM_NS_IMAGE_OFFSET;
+}
+
+/*******************************************************************************
+ * Gets SPSR for BL32 entry
+ ******************************************************************************/
+uint32_t arm_get_spsr_for_bl32_entry(void)
+{
+       /*
+        * The Secure Payload Dispatcher service is responsible for
+        * setting the SPSR prior to entry into the BL32 image.
+        */
+       return 0;
+}
+
+/*******************************************************************************
+ * Gets SPSR for BL33 entry
+ ******************************************************************************/
+uint32_t arm_get_spsr_for_bl33_entry(void)
+{
+       unsigned long el_status;
+       unsigned int mode;
+       uint32_t spsr;
+
+       /* Figure out what mode we enter the non-secure world in */
+       el_status = read_id_aa64pfr0_el1() >> ID_AA64PFR0_EL2_SHIFT;
+       el_status &= ID_AA64PFR0_ELX_MASK;
+
+       mode = (el_status) ? MODE_EL2 : MODE_EL1;
+
+       /*
+        * TODO: Consider the possibility of specifying the SPSR in
+        * the FIP ToC and allowing the platform to have a say as
+        * well.
+        */
+       spsr = SPSR_64(mode, MODE_SP_ELX, DISABLE_ALL_EXCEPTIONS);
+       return spsr;
+}
+
+/*******************************************************************************
+ * Configures access to the system counter timer module.
+ ******************************************************************************/
+#ifdef ARM_SYS_TIMCTL_BASE
+void arm_configure_sys_timer(void)
+{
+       unsigned int reg_val;
+
+#if ARM_CONFIG_CNTACR
+       reg_val = (1 << CNTACR_RPCT_SHIFT) | (1 << CNTACR_RVCT_SHIFT);
+       reg_val |= (1 << CNTACR_RFRQ_SHIFT) | (1 << CNTACR_RVOFF_SHIFT);
+       reg_val |= (1 << CNTACR_RWVT_SHIFT) | (1 << CNTACR_RWPT_SHIFT);
+       mmio_write_32(ARM_SYS_TIMCTL_BASE + CNTACR_BASE(PLAT_ARM_NSTIMER_FRAME_ID), reg_val);
+#endif /* ARM_CONFIG_CNTACR */
+
+       reg_val = (1 << CNTNSAR_NS_SHIFT(PLAT_ARM_NSTIMER_FRAME_ID));
+       mmio_write_32(ARM_SYS_TIMCTL_BASE + CNTNSAR, reg_val);
+}
+#endif /* ARM_SYS_TIMCTL_BASE */
+
+/*******************************************************************************
+ * Returns ARM platform specific memory map regions.
+ ******************************************************************************/
+const mmap_region_t *plat_arm_get_mmap(void)
+{
+       return plat_arm_mmap;
+}
+
+#ifdef ARM_SYS_CNTCTL_BASE
+
+#if ERROR_DEPRECATED
+unsigned int plat_get_syscnt_freq2(void)
+{
+       unsigned int counter_base_frequency;
+#else
+unsigned long long plat_get_syscnt_freq(void)
+{
+       unsigned long long counter_base_frequency;
+#endif /* ERROR_DEPRECATED */
+
+       /* Read the frequency from Frequency modes table */
+       counter_base_frequency = mmio_read_32(ARM_SYS_CNTCTL_BASE + CNTFID_OFF);
+
+       /* The first entry of the frequency modes table must not be 0 */
+       if (counter_base_frequency == 0)
+               panic();
+
+       return counter_base_frequency;
+}
+
+#endif /* ARM_SYS_CNTCTL_BASE */
index 249a40684d80eb7bb0fdba6f07725636b98aaf5b..03b9fe47b7cb83cf73a639f6f1cf3ad97dfc8ecb 100644 (file)
@@ -97,8 +97,8 @@ PLAT_INCLUDES         +=      -Iinclude/common/tbbr                           \
 
 PLAT_BL_COMMON_SOURCES +=      lib/xlat_tables/xlat_tables_common.c            \
                                lib/xlat_tables/aarch64/xlat_tables.c           \
-                               plat/arm/common/aarch64/arm_common.c            \
                                plat/arm/common/aarch64/arm_helpers.S           \
+                               plat/arm/common/arm_common.c                    \
                                plat/common/aarch64/plat_common.c
 
 BL1_SOURCES            +=      drivers/arm/sp805/sp805.c                       \
index b27586f77627ad97d8e5856f8a0594dae8deb503..7cfb15950fcca38760cc1000e655669892ae0dbe 100644 (file)
@@ -68,9 +68,9 @@ PLAT_BL_COMMON_SOURCES        :=      lib/xlat_tables/xlat_tables_common.c            \
                                drivers/arm/gic/v2/gicv2_helpers.c              \
                                drivers/cadence/uart/cdns_console.S             \
                                drivers/console/console.S                       \
-                               plat/arm/common/aarch64/arm_common.c            \
                                plat/arm/common/aarch64/arm_helpers.S           \
                                plat/arm/common/arm_cci.c                       \
+                               plat/arm/common/arm_common.c                    \
                                plat/arm/common/arm_gicv2.c                     \
                                plat/common/plat_gicv2.c                        \
                                plat/common/aarch64/plat_common.c               \